straggling nits (#1236)

* actually quit using gpsfmt.h

* use auto

* empty statements

* join declaration and assignment

* fix tab

* make member funct static

* delete renamed prototypes

* const pointers

* more const pointers

* empty statements

diff --git a/defs.h b/defs.h
index 1e4523f43510fb139cef50b395b96c9ddfac935c..7604be2f19db7ad714d08be7215e4ef750a9f876 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -701,8 +701,8 @@ void track_disp_session(const session_t* se, route_hdr rh, route_trl rt, waypt_c
 void route_flush_all_routes();
 void route_flush_all_tracks();
 void route_deinit();
-void route_append(RouteList* src);
-void track_append(RouteList* src);
+void route_append(const RouteList* src);
+void track_append(const RouteList* src);
 void route_backup(RouteList** head_bak);
 void route_restore(RouteList* head_bak);
 void route_swap(RouteList& other);

diff --git a/googletakeout.cc b/googletakeout.cc
index af824ae231283501b932a089ed05d6007e0b7b58..eb061239dc958d18648fdee5ff50ffbd42dd4713 100644 (file)
--- a/googletakeout.cc
+++ b/googletakeout.cc
@@ -65,7 +65,7 @@ static Waypoint* takeout_waypoint(
   const QString* start_str
 )
 {
-  Waypoint* waypoint = new Waypoint();
+  auto* waypoint = new Waypoint();
   waypoint->latitude = lat_e7 / 1e7;
   waypoint->longitude = lon_e7 / 1e7;
   if (shortname && shortname->length() > 0) {

diff --git a/gpx.cc b/gpx.cc
index f8e0cebc38c6b4935f658d1b8efcf03d931e5781..04e3e408b31d5153504b8849b5ae5a520f672650 100644 (file)
--- a/gpx.cc
+++ b/gpx.cc
@@ -1184,7 +1184,7 @@ GpxFormat::write_attributes(const QXmlStreamAttributes& attributes) const
 }
 
 void
-GpxFormat::fprint_xml_chain(XmlTag* tag) const
+GpxFormat::fprint_xml_chain(const XmlTag* tag) const
 {
   while (tag) {
     writer->writeStartElement(tag->tagname);

diff --git a/gpx.h b/gpx.h
index c0d0218ac050fece9052ec4c83d2f48d715b0b2d..741c91bb873a1ed09fc2bc4ccb31b216f8a14406 100644 (file)
--- a/gpx.h
+++ b/gpx.h
@@ -221,7 +221,7 @@ private:
   void tag_wpt(const QXmlStreamAttributes& attr);
   void tag_cache_desc(const QXmlStreamAttributes& attr);
   void tag_gs_cache(const QXmlStreamAttributes& attr) const;
-  void tag_garmin_fs(tag_type tag, const QString& text, Waypoint* waypt);
+  static void tag_garmin_fs(tag_type tag, const QString& text, Waypoint* waypt);
   void start_something_else(QStringView el, const QXmlStreamAttributes& attr);
   void end_something_else();
   void tag_log_wpt(const QXmlStreamAttributes& attr) const;
@@ -230,7 +230,7 @@ private:
   void gpx_cdata(QStringView s);
   QString qualifiedName() const;
   void write_attributes(const QXmlStreamAttributes& attributes) const;
-  void fprint_xml_chain(XmlTag* tag) const;
+  void fprint_xml_chain(const XmlTag* tag) const;
   void write_gpx_url(const UrlList& urls) const;
   void write_gpx_url(const Waypoint* waypointp) const;
   void write_gpx_url(const route_head* rh) const;

diff --git a/jeeps/gps.h b/jeeps/gps.h
index f883911f34d39d7e3c91de85c2430becbeb95cdf..b8d1e70466d7a176b77c8faac8624aaf12b71d76 100644 (file)
--- a/jeeps/gps.h
+++ b/jeeps/gps.h
@@ -241,7 +241,6 @@ using pcb_fn = int (*)(int, GPS_SWay**);
 #include "jeeps/gpsapp.h"
 #include "jeeps/gpsprot.h"
 #include "jeeps/gpscom.h"
-#include "jeeps/gpsfmt.h"
 #include "jeeps/gpsmath.h"
 #include "jeeps/gpsmem.h"
 #include "jeeps/gpsrqst.h"

diff --git a/mtk_logger.h b/mtk_logger.h
index f54b8ed087d8128efc6e0a2242985c7ef9ea8ead..7b8b7602ea546e69d1a9abd9a96eabe5c69fd7c2 100644 (file)
--- a/mtk_logger.h
+++ b/mtk_logger.h
@@ -314,15 +314,17 @@ public:
   void rd_init(const QString& fname) override
   {
     mtk_rd_init(fname);
-  };
+  }
+
   void read() override
   {
     mtk_read();
-  };
+  }
+
   void rd_deinit() override
   {
     mtk_rd_deinit();
-  };
+  }
 };
 
 class MtkM241Format : public Format, private MtkLoggerBase
@@ -346,15 +348,17 @@ public:
   void rd_init(const QString& fname) override
   {
     mtk_rd_init_m241(fname);
-  };
+  }
+
   void read() override
   {
     mtk_read();
-  };
+  }
+
   void rd_deinit() override
   {
     mtk_rd_deinit();
-  };
+  }
 };
 
 class MtkFileFormat : public Format, private MtkLoggerBase
@@ -378,15 +382,17 @@ public:
   void rd_init(const QString& fname) override
   {
     file_init(fname);
-  };
+  }
+
   void read() override
   {
     file_read();
-  };
+  }
+
   void rd_deinit() override
   {
     file_deinit();
-  };
+  }
 };
 
 class MtkM241FileFormat : public Format, private MtkLoggerBase
@@ -410,14 +416,16 @@ public:
   void rd_init(const QString& fname) override
   {
     file_init_m241(fname);
-  };
+  }
+
   void read() override
   {
     file_read();
-  };
+  }
+
   void rd_deinit() override
   {
     file_deinit();
-  };
+  }
 };
 #endif // MTK_LOGGER_H_INCLUDED_

diff --git a/ozi.h b/ozi.h
index bcb8a4062c36563d97d9cbd3455ad61a492b73cf..fc4478a4768af6abfdcd8a34e9aee01cc30ceb81 100644 (file)
--- a/ozi.h
+++ b/ozi.h
@@ -109,9 +109,7 @@ private:
   void ozi_parse_track(int field, const QString& str, Waypoint* wpt_tmp, char* trk_name);
   static void ozi_parse_routepoint(int field, const QString& str, Waypoint* wpt_tmp);
   void ozi_parse_routeheader(int field, const QString& str);
-  void data_read();
   void ozi_waypt_pr(const Waypoint* wpt, int index);
-  void data_write();
 
   /* Data Members */
 

diff --git a/route.cc b/route.cc
index f8fdd842202e2277be26b89de847dd81903e26ba..a065bd5fb5fc8a0d8408c60665fb8a6c501b7e9c 100644 (file)
--- a/route.cc
+++ b/route.cc
@@ -206,13 +206,13 @@ route_deinit()
 }
 
 void
-route_append(RouteList* src)
+route_append(const RouteList* src)
 {
   src->copy(&global_route_list);
 }
 
 void
-track_append(RouteList* src)
+track_append(const RouteList* src)
 {
   src->copy(&global_track_list);
 }

diff --git a/src/core/xmlstreamwriter.h b/src/core/xmlstreamwriter.h
index 87b236e808fbc37aa9554c1fcb6bf668ee452ea2..2d0372f4d277de662c36411b43bedd31972595f8 100644 (file)
--- a/src/core/xmlstreamwriter.h
+++ b/src/core/xmlstreamwriter.h
@@ -60,7 +60,7 @@ private:
     explicit xml_command(xml_wrt_cmd_t t,
                          QString n = QString(),
                          QString v = QString())
-      : type(t), name(std::move(n)), value(std::move(v)) {};
+      : type(t), name(std::move(n)), value(std::move(v)) {}
 
     xml_wrt_cmd_t type;
     QString name;
@@ -74,7 +74,7 @@ private:
     {
       stack.append(other.stack);
       element_count += other.element_count;
-    };
+    }
 
     void append(const xml_command& cmd)
     {
@@ -94,7 +94,7 @@ private:
       case xml_wrt_cmd_t::name_space:
         break;
       }
-    };
+    }
 
     xml_stack_t stack;
     int element_count{0};

diff --git a/src/core/xmltag.cc b/src/core/xmltag.cc
index 2376bce3d13a25f37290ca8c33a62e876c991afb..717979ea44b841257002955a5c59ef7c3882e9fc 100644 (file)
--- a/src/core/xmltag.cc
+++ b/src/core/xmltag.cc
@@ -91,7 +91,7 @@ free_xml_tag(XmlTag* tag)
 
 // FIXME: at some point, this becomes a plain ole copy constructor.
 static void
-copy_xml_tag(XmlTag** copy, XmlTag* src, XmlTag* parent)
+copy_xml_tag(XmlTag** copy, const XmlTag* src, XmlTag* parent)
 {
   if (!src) {
     *copy = nullptr;

diff --git a/text.cc b/text.cc
index 74a9df387985b61c1bffc308456cc7f073702f1d..46533eaa8d0b47e780e202149d65b2e4f9486f24 100644 (file)
--- a/text.cc
+++ b/text.cc
@@ -147,7 +147,7 @@ TextFormat::text_disp(const Waypoint* wpt)
 
         logpart = curlog->xml_findfirst(u"groundspeak:date");
         if (logpart) {
-          gpsbabel::DateTime logtime = xml_parse_time(logpart->cdata).toUTC();;
+          gpsbabel::DateTime logtime = xml_parse_time(logpart->cdata).toUTC();
           *file_out << logtime.toString(u"yyyy-MM-dd") << "\n";
         }
 

diff --git a/xcsv.cc b/xcsv.cc
index 0047814812a0ac7a59d31b2d382cd098adbd37d0..747660622d40da5922f92c902c2a5967d90f3911 100644 (file)
--- a/xcsv.cc
+++ b/xcsv.cc
@@ -646,8 +646,7 @@ XcsvFormat::xcsv_parse_val(const QString& value, Waypoint* wpt, const XcsvStyle:
   }
   break;
   case XcsvStyle::XT_GEOCACHE_LAST_FOUND: {
-    QDate date;
-    date = yyyymmdd_to_time(value);
+    QDate date = yyyymmdd_to_time(value);
     wpt->AllocGCData()->last_found = date.startOfDay();
     break;
   }